merge r23114
authorJo-Philipp Wich <[email protected]>
Thu, 23 Sep 2010 17:33:52 +0000 (17:33 +0000)
committerJo-Philipp Wich <[email protected]>
Thu, 23 Sep 2010 17:33:52 +0000 (17:33 +0000)
commita447746a8217d7c8ea751b293771e9b4e12a82e1
tree89602f3f88a2ae09973fb9e42ae7e4b5459b2836
parent08c544f60a86f5ee22b16d477c708396880dcc33
merge r23114

SVN-Revision: 23115
package/base-files/files/lib/preinit/41_merge_overlay_hooks